Rollup of 13 pull requests #61127

Centril · 2019-05-24T17:17:12Z

Successful merges:

Don't arena-allocate static symbols. #61077 (Don't arena-allocate static symbols.)
Make find_local iterate instead of recurse #61094 (Make find_local iterate instead of recurse)
Update cargo #61095 (Update cargo)
tidy: don't short-circuit on license error #61096 (tidy: don't short-circuit on license error)
Make find iterate instead of recurse #61103 (Make find iterate instead of recurse)
Make eval_place_to_op iterate instead of recurse #61104 (Make eval_place_to_op iterate instead of recurse)
Fix a couple docs typos #61107 (Fix a couple docs typos)
Fixed type-alias-bounds lint doc #61111 (Fixed type-alias-bounds lint doc)
Deprecate FnBox. Box<dyn FnOnce()> can be called directly, since 1.35 #61113 (Deprecate FnBox. Box<dyn FnOnce()> can be called directly, since 1.35)
Remove the incorrect warning from README.md #61116 (Remove the incorrect warning from README.md)
Dont ICE on an attempt to use GAT without feature gate #61118 (Dont ICE on an attempt to use GAT without feature gate)
Make eval_place iterate instead of recurse #61120 (Make eval_place iterate instead of recurse)
Updated my mailmap entry #61125 (Updated my mailmap entry)

Failed merges:

If there is more than one license error, tidy would only print the first error. This changes it so that all license errors are printed.

The example code under type-alias-bounds lint produced two warnings - one from the lint itself and another from the dead_code lint, and only the second one was in the doc. This looked like an error, so I've added `#[allow(dead_code)]` and replaced the example output with the expected one. [Playground](https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&code=%23%5Ballow(dead_code)%5D%0Atype%20SendVec%3CT%3A%20Send%3E%20%3D%20Vec%3CT%3E%3B)

@Zoxc

My problem was user error; thanks to @Zoxc for fixing me! r? @alexcrichton

…1.35 FCP completion: rust-lang#28796 (comment)

It's just a waste of memory. This also gets rid of the special case for "".

…on cleanly.

…ilation cleanly.

@petrochenkov

…henkov Don't arena-allocate static symbols. It's just a waste of memory. This also gets rid of the special case for "". r? @petrochenkov

@oli-obk

…i-obk Make find_local iterate instead of recurse r? @oli-obk

Update cargo Update cargo 14 commits in c4fcfb725b4be00c72eb9cf30c7d8b095577c280..545f354259be4e9745ea00a524c0e4c51df01aa6 2019-05-15 19:48:47 +0000 to 2019-05-23 17:45:30 +0000 - Bump to 0.38.0 (rust-lang/cargo#6979) - cargo package: detect new empty directories (rust-lang/cargo#6973) - Add message caching. (rust-lang/cargo#6933) - Fix typo (rust-lang/cargo#6974) - Set `Finished` line correctly for debug=0. (rust-lang/cargo#6971) - Clippy fixes (rust-lang/cargo#6970) - Remove rustdoc `can_add_color_process`. (rust-lang/cargo#6968) - Document new `doctest` field. (rust-lang/cargo#6965) - Update some man pages that missed --offline. (rust-lang/cargo#6964) - add public & private prop tests. (rust-lang/cargo#6962) - zsh completion: Pull list of commands from cargo --list (rust-lang/cargo#6956) - Change docs "inequality" for semver requirement. (rust-lang/cargo#6963) - Update im-rc requirement from 12.1.0 to 13.0.0 (rust-lang/cargo#6959) - Add `doctest` field into metadata (rust-lang/cargo#6953)

…=Centril tidy: don't short-circuit on license error If there is more than one license error, tidy would only print the first error. This changes it so that all license errors are printed.

@oli-obk

Make find iterate instead of recurse r? @oli-obk

@oli-obk

…, r=oli-obk Make eval_place_to_op iterate instead of recurse r? @oli-obk

Fix a couple docs typos Also add a link to env::split_paths.

@steveklabnik

Fixed type-alias-bounds lint doc The example code under type-alias-bounds lint produced two warnings - one from the lint itself and another from the dead_code lint, and only the second one was in the doc. This looked like an error, so I've added `#[allow(dead_code)]` and replaced the example output with the expected one. [Playground](https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&code=%23%5Ballow(dead_code)%5D%0Atype%20SendVec%3CT%3A%20Send%3E%20%3D%20Vec%3CT%3E%3B) According to guidelines, r? @steveklabnik

Deprecate `FnBox`. `Box<dyn FnOnce()>` can be called directly, since 1.35 FCP completion: rust-lang#28796 (comment)

@Zoxc

…crichton Remove the incorrect warning from README.md My problem was user error; thanks to @Zoxc for fixing me! r? @alexcrichton

…t, r=varkor Dont ICE on an attempt to use GAT without feature gate Fix rust-lang#60654

@oli-obk

…i-obk Make eval_place iterate instead of recurse r? @oli-obk

Updated my mailmap entry

Centril · 2019-05-24T17:17:27Z

@bors r+ p=13 rollup=never

bors · 2019-05-24T17:17:29Z

📌 Commit b267b94 has been approved by Centril

bors · 2019-05-24T17:24:29Z

⌛ Testing commit b267b94 with merge ddc123df8804094d095570263251a70409df731b...

oli-obk · 2019-05-24T17:28:06Z

#61120 has a tidy failure

Centril · 2019-05-24T17:29:54Z

sigh

rust-highfive · 2019-05-24T17:32:48Z

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

Cloning into 'rust-lang/rust'...
travis_time:end:11df07bc:start=1558719029865364309,finish=1558719035494501372,duration=5629137063
$ cd rust-lang/rust
$ git checkout -qf ddc123df8804094d095570263251a70409df731b
fatal: reference is not a tree: ddc123df8804094d095570263251a70409df731b
The command "git checkout -qf ddc123df8804094d095570263251a70409df731b" failed and exited with 128 during .
Your build has been stopped.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

rust-highfive · 2019-05-24T17:39:56Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:0758c495:start=1558718523751343877,finish=1558718641223458793,duration=117472114916
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---

[00:04:04] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:05] tidy error: /checkout/src/librustc_mir/interpret/place.rs:624: line longer than 100 chars
[00:04:10] some tidy checks failed
[00:04:10] 
[00:04:10] 
[00:04:10] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:10] 
[00:04:10] 
[00:04:10] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:10] Build completed unsuccessfully in 0:01:15
[00:04:10] Build completed unsuccessfully in 0:01:15
[00:04:10] make: *** [tidy] Error 1
[00:04:10] Makefile:67: recipe for target 'tidy' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:08d6cb0a
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Fri May 24 17:28:21 UTC 2019
---
travis_time:end:248fa9ab:start=1558718902010591003,finish=1558718902015807885,duration=5216882
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:03888abc
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:083998ee
travis_time:start:083998ee
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1db7c688
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

spastorino and others added 30 commits May 23, 2019 22:17

Make find_local iterate instead of recurse

2e39b9c

Update cargo

d5e0353

tidy: don't short-circuit on license error

46ffb6a

If there is more than one license error, tidy would only print the first error. This changes it so that all license errors are printed.

typo

d3c73dd

Fix typo "spit_paths", add link

0123fab

Use FnOnce instead of FnBox in libtest

a8fc09b

Remove the incorrect warning from README.md

67ee286

My problem was user error; thanks to @Zoxc for fixing me! r? @alexcrichton

Deprecate FnBox. Box<dyn FnOnce()> can be called directly, since …

73fd349

…1.35 FCP completion: rust-lang#28796 (comment)

Don't arena-allocate static symbols.

e396f99

It's just a waste of memory. This also gets rid of the special case for "".

Delay ICE in fold_region so feature gate has chance to stop compilati…

698e50f

…on cleanly.

Delay ICE in early_free_scope so feature gate has chance to stop comp…

8e4132a

…ilation cleanly.

Regression test for issue rust-lang#60654.

c235ba4

Make eval_place iterate instead of recurse

e7c2777

Make eval_place_to_op iterate instead of recurse

3dccf83

Make find iterate instead of recurse

34314ca

Updated my mailmap entry

aba152d

Rollup merge of rust-lang#61077 - nnethercote:tweak-prefill, r=petroc…

bd606ec

…henkov Don't arena-allocate static symbols. It's just a waste of memory. This also gets rid of the special case for "". r? @petrochenkov

Rollup merge of rust-lang#61094 - spastorino:find-local-iterate, r=ol…

d746cfa

…i-obk Make find_local iterate instead of recurse r? @oli-obk

Rollup merge of rust-lang#61096 - ehuss:tidy-license-short-circuit, r…

249b44c

…=Centril tidy: don't short-circuit on license error If there is more than one license error, tidy would only print the first error. This changes it so that all license errors are printed.

Rollup merge of rust-lang#61103 - spastorino:find-iterate, r=oli-obk

24ee7ba

Make find iterate instead of recurse r? @oli-obk

Rollup merge of rust-lang#61104 - spastorino:eval-place-to-op-iterate…

a699337

…, r=oli-obk Make eval_place_to_op iterate instead of recurse r? @oli-obk

Rollup merge of rust-lang#61107 - blkerby:docs_typos, r=Centril

b2a97b9

Fix a couple docs typos Also add a link to env::split_paths.

Rollup merge of rust-lang#61113 - SimonSapin:fnbox, r=alexcrichton

373ae48

Deprecate `FnBox`. `Box<dyn FnOnce()>` can be called directly, since 1.35 FCP completion: rust-lang#28796 (comment)

Rollup merge of rust-lang#61116 - scottmcm:vcpp-download-link, r=alex…

40df4c0

…crichton Remove the incorrect warning from README.md My problem was user error; thanks to @Zoxc for fixing me! r? @alexcrichton

Rollup merge of rust-lang#61118 - pnkfelix:issue-60654-dont-ice-on-ga…

85b7dbf

…t, r=varkor Dont ICE on an attempt to use GAT without feature gate Fix rust-lang#60654

Rollup merge of rust-lang#61120 - spastorino:eval-place-iterate, r=ol…

cdfacbd

…i-obk Make eval_place iterate instead of recurse r? @oli-obk

Rollup merge of rust-lang#61125 - XAMPPRocky:master, r=jonas-schievink

b267b94

Updated my mailmap entry

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 24, 2019

Centril closed this May 24, 2019

Centril deleted the rollup-4xipbkf branch May 24, 2019 17:29

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 13 pull requests #61127

Rollup of 13 pull requests #61127

Centril commented May 24, 2019

Centril commented May 24, 2019

bors commented May 24, 2019

bors commented May 24, 2019

oli-obk commented May 24, 2019

Centril commented May 24, 2019

rust-highfive commented May 24, 2019

rust-highfive commented May 24, 2019

Rollup of 13 pull requests #61127

Rollup of 13 pull requests #61127

Conversation

Centril commented May 24, 2019

Centril commented May 24, 2019

bors commented May 24, 2019

bors commented May 24, 2019

oli-obk commented May 24, 2019

Centril commented May 24, 2019

rust-highfive commented May 24, 2019

rust-highfive commented May 24, 2019